Fixed gtkiconview dispose cycle to not fire warnings.

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 1cdeb2e86e38b74567c7913950f35b166df61474..1d03c03b8129d29192b518e0f6b0948e76169d26 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -4732,7 +4732,9 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
       icon_view->priv->scroll_to_path = NULL;
     }
 
-  gtk_cell_area_stop_editing (icon_view->priv->cell_area, TRUE);
+  /* The area can be NULL while disposing */
+  if (icon_view->priv->cell_area)
+    gtk_cell_area_stop_editing (icon_view->priv->cell_area, TRUE);
 
   if (model)
     {